finished GFFP and added better orginize