Just moved some stuff around so that it's easier to manipulate the different parameters.