checked few TODO