improved TODO