#9 minor changes