Adjust for new moto's...