Scaling implemented but not yet tested