Minor change:
- reusing existing methods