Adding conditionals for different statements and functions