add missing changes back in.