resolved few TODO