4th refactor of scalehandle