ErrorChecking 2.0 with modular design
Merged