Changes from FROGGS++