Completing the some more changes