Use current_on_hand isntead of hardcoded value