Improve RWD v3.2