removed a few things that were not needed but added much more