BAD35 & BAD36 corrected