Added some temporary stuff, should be removed