removed some overloaded arities, hopefully making the code clearer