Version 1.1.0
Added setup to methods to reduce duplicate code