A very-slightly-different version