changes suggested by @sheppard