Inlining some filter methods to try to improve performance.
Forgot to remove the while loop
Disro update