Apply changes previously only made to javascript implementation