Started fixing scaling