overhaul of the monitor and property class