- Continnue the user implementation
- Some changes