Added more comments for TODO