Added and removed a couple of things