merged cornes changes