Improved

Reduced Size
Made Modular
Made easier to modify