added idp and invariants
merged conflicts