futher changes to js