handled context a little more reasionably