All the requested changes are done