1. refactoring
2. new uri