Moved ouse tracking to one method