Clarified the TODO #1