updated TODO
merged