Updates from friday that did not commit for some reason