Updated modules
Added scaling