adding back in more missing changes