Ported changes to informal to formal