Added all kinds of stuff