refactored
fixed #1136 and added previously ignored membership obligations