refactored content location