The infamous puddle...it must go!