Added some stuff i don't remember about