VID-2138 consolidate methods