Motorcycle class reworked.