Added locking and customer supplied stock