Updated protocols and such