WIP: java8
WIP: clean up %E5 mess