changes and commenting