[Auto Converted Code] Also some alterations to block parameter code