Massive revamp with simplification and improved specs