Tidied up tracking, now displays on screen