merging in current js status