Incorporated Stefan's comments.