adding ws aliases
merging