(getting rid of one more add_* function)