Implemented JH's changes down to accessCondition-class