Contact PWD Improvements