removed layer of indirection