refactor, working with track changes and track length