Added assessment and planning rules - not tested