Adding Phil's changes to the FPWD

Updating the FPWD