Added note to TODO