Incorporate FROGGS++'s changes.