updated for new server changes