Pathfinder initial
Java6 fix
Java6 fix
continue