Updated per Davids Samples