Added/change for more js