Added scaling capabilities