Improved room model.