update to new option parser