making wait_factor a short int instead of a boolean