Updated Server to Use Brian's