beforedrive fixed & done