tidied up manual tracking