Updates to the "master logic" (mostly added parameters)