Refactored and renamed