some changes fro ma cli