refactored stock
refactored architecture