ok ok final edit