removed old parameters
Changed location of parameters