Modified guest a little.