Restored changes inbetween my changes yesterday and other changes today