Flow and majd

Changes