Enhancing TWave

**ToDo**

- [x] Make rewrite methods work
*neither