Added proper conditions for different situations during policy usage