Changes to track model - compile dat shit