add a bunch of extra stuff