Adding in logic to let conversion happen