expanded todo for clarity