Extra-room functionality added