reverting back to old cli parsing function