Fixed add mix, need to do edit