MASTER: Changed the semantics of a couple area's.