Change to one function call.  Remove calls