Ajay/Melanie |#0000| Updated view