Updated for JEM usage
2 files changed