added Listener to Tracker & renamed stuff