Working on fixing scaling issues