added option saveModular