some subtle modifications