FIX - add option to omit the endlist option