Adding Phil's changes to the FPWD