Many more changes.
Edit 3 in Starbucks.