Added bunch of stuff