maybe this can go to setup as well