[UPDATE] TODO and added comment.