Fixing speed issue
Ok for integration