Improvement but still buggy
A bit buggy but an improvement