Added event tracking as well