reorganise a little
fix mutation bug