More work on roverside code