Final merge?
FINAL JS-ONLY