Updated with more detailed checks for bimota