CPU use significantly reduced Fixes #6