Added logic to current situation screen