Updated with latest server setup