Ajay/Melanie |#0000 | Fixing ft