Performance fix

80% cpu -> 10% - ish