Finished jps and added calls