Minor changes are committed