merge in mandacht3's changes