Need to also pass the options through