- Implemented more methods