some updates
adding tracking
fixing merge