Refactor 1
Refactor2