added istanbul related bits