First revision with working track import