Modify for JPsi method