Improved

Reduced Size
Made more modular
Made easier to change