added few TODO lines