Improve RWD type scale