Change to be closer to original code.