More updates and attempts to fix issues with slowness in the algorithm