Attempt to improve performance and stability