PW-12121 Design updates