add conditionals for some things