revamped the entire system into simpler mechanics