Changes due to feedback from Matthias