latest changes before going to breakfast :D