changed options parser