Improve stock activity and prepare deploy feature