Created wanna-be Context class, ajusted code