attempt 1 to rename optional parameters properly
fix for optional params