try to be more consistent in using options