this is the final edit hopefully