Few more improvement; devectorize mostly