Some minor changes for evaluation purposes.