Dan is workking 100 percent. Switch to offset function
Merge branch 'js_rewrite'