Fixed + Broke some stuff ;/