5.4.02

Revision of  tracker functions, 25% completed