Updated version of tracker, as well as some new library functions