Adding more stuff I had left out