Adding logic for making Guest look good