Updates according to comments bt Domenic.