Ajay/Melanie | #0000 | Added more event tracking