Added some more stuff. dontremember