added rooms and encryption