edited up to the end of proposition