Updated some parameters to make it easier to understand