New stock will include the carbon bipod