fixing track bugs, merge conflics
fixing merge conflicts