forgot to add some things after the refactor