Added all sorts of new features