Still fixing stock calculations