replaced some jps stuff