re-implementing 45bc295 and 05e1377 from microverse hacks
Merge branch 'Davids_controller_pooling_fix' into WORK