RWD desing upgrade