Changed around options - ready to send to CRAN?