Add Edit works. But workflow is not clean. Need Review