add option for old behavior