forgot some things from last commit