Changes properly committed this time