Added all the performance stuff