More work on rooms and times.