More work on the new tracks...