Updates

- Builded from scratch
- Code improvements