merge with solution of iDirty