The Walker- Fotz and the Tantrums fixed