Merge Of jkg wiht new engine