finished edit and update features