Added all kinds of new features