add SR's suggestion in TODO list