Fixed the merge of all three JS bits