updates for 1.17 - issues with controllers -