final edit - completed