Rolled in basic ws and updated paths