Supports new server

This update modified code to handle the new server