Add JS functions
Resolve merge