refactored site