and add back the parts I accidentally removed