Policy refinement hopefully bug free now :)