Scaling, added unneeded stuff