adjustments from incorrect merging of two versions...