MP-435 #comment Update with new parameters. There are several little bugs in here that should be corrected.