Modifications done according to Sascha's comments