moved some parameters around