Started refactoring discussion diffrences