first final edit by Marc