make the code match the spec...