Updated the stuff properly