Add stage3 still work in progress