Better options. Closes #506