Updated to talk to JS code