completely refactored site