Try and fix the performance issues... I hope?