non-motif integration fixed