adding back in v8 after reverting somethings