Add gkw's changes.