Commit by Davis

This time please review it & commit.