finished with changes