added naive context implementation