Some more flexibility in the codebase
Added scaling :)