added :you and :self-room for s expresions