added clock, added tracking code