re-add some things that were removed