Cleanup and explanation of how this differs