Fixed Service bug - need to fix HLPEngine ref in states still