Guests are dropped with names,code refactoring