I added a couple things from the last one