final edit (for now)