fix composite
fix some traces
continue with composite