added comment and TODO