modified in lines with a recent discussion