Small changes from Lisbeths correction added