add sqw and other features