continue fixing stock
Merge branch 'Finishing-Stock'