Improve RWD v3.31