Made changes per LasTLiE's Jan 2 2013 comments