rolling back in learnings and simplifications from implementation work so far