More work on js