add back changes that I missed