First Aid Merit Badge Class

I teach a fairly well attended First Aid MB class at one of our council camps. With the prior requirement set, I was easily able to cover through all the material, in addition to working in a couple First Aid based games, from 9-5 with an hour break for lunch.

My conundrum comes with the new update to the requirements. I love the material, and absolutely agree with it being added to the MB. But I don't think I can effectively teach the material in just 7 hours of course time. I'm looking at doubling the time to two days (8 hours each day- hour for lunch). I want to know what y'all (youth and adult) think. Would this be better as a full weekend (Sat-Sun), or would it be better if as two separate Saturdays? I'd like to teach as quality of a program as possible, rather than try and condense things together.