filter back to way it was
some refactorin. working on track area