minor changes as requested by Jordan