Finish GFDL
Bug fix for 04 06