simplify loading controller needs work to DRY up
Release v2.0.14