added more info to TODO