All the changes required