improving RWD design slowly