Latest changes from Brett/Frog