Overwritten with hoauth changes