trying to make context smrter (but might have broken something, oops)