Merging local and ilogos changes