Updated: Java 8 magic!