Revert "Revert "JJake Update""

This reverts commit 3a12c6151de376ac2965440921dfb218446ac554.