adapted to new swimmer class