changes suggested by rune