I added a few things and removed some junk