Update

- There has been changes (plus7 side)
- bugs fixed