few changes asked by david