changes suggested by Martin