Fixed invigorate (functions needs fixing)