Moved some line around, maybe it's an improvement?