Changes to allow for immediate use by guest