Changed init to allow for passing parameters