Woops, I didn't answer the question at all, did I
For our submission, yes, we pretty much followed the criteria. We had a lot of material to work with, so depending on how much time it ends up taking to get through all the material, we may or may not have extra things thrown in.