stop using raw Context and changed to wrap