IMPORTANT REFACTORING YO