- Replace events with hooks
- bug fixes