rework random import