zw - adding some new stuff