Changes committed for attempt #2 #2