altered for new test set