Added slight context reactivity. Still bad, though.