#1 minor changes