[IMP] Changing view to make it more v8 Friendly
[IMP] Modifying states to try to make them more streamlined