Added JFPuget edit