Revert "Update parameters + minor changes"

This reverts commit 302f263eef66118e1f39d22bc9c5befa3d3abd60.