started change to context type instead of module