minor structure change.