Just in case need to revert to this
Refactoring