made options arg more consistent