je updates
cleaned up merge