Re-wrote methods to remove some opts.