refactored albums