modified sub handling