change option parse logic