FIX TO REFACTORIZATION!