vezzi development w/merge resolution from mariogiov