Changed to adapt to the new server