changes as suggested by eddiemonge