TODO update
Downgrade to java 1.7