Ported back more changes.