feedback added to TODO