added some situational awarness