added Parameter Manager + changed contoller slightly