Made multiple changes