modification for real delivery test