changes as suggested by smichr