Merging modilabs + added warnings + flat instance option