Included a bunch of new features