Rework to used the new scale manager