final edit from my end