Update stuff from floyd