second version before assembly add