Add back performance check