0.8.0 refactor scale