Added some things, found a problem