1) Activated the module 'wait_for_complete'
2) Optimized calculations of observed and ideal distance

TBD: Testing for these modules and regression