fixed performance stuff