adjusted to not require options