Changes from Flo made