merged Noah's suggestions