update to PWD Controller
resolve merge conflict