Added all kind of stuff