Add new version of rwd20 with safe apply