moving next / previous logic from race decorator into interval model