Reworking things to try and make things run faster