Tons of changes and commenting