updated TODO with java 8