Added some things, mostly to test if it works