few TODO lines added