#2 Refactor + hotfix