Added some amazing stuff (and less amazing)