Added some stuff (doesnt work)