applied changed brought forth by Chris' "changes" email