Updated scale logic