worked more on js