Change arg to option