re#24 slight editing