Adding a few other variables and if/else statements