incorporated feedback from d40cht