All the changes
resolved