Cleanup + perf + yellow ball works