Reverted from frank's implemention of out stock feature
Recovered from the conflict