second commit... added Scotts suggestions