changed dummy proofing a bit
Merge dummy-proofing from FG1.2