final version edit