Situation.cpp Update