This adds a capacity parameter for added safety. It also changes the
order of parameters to make it a bit more consistent.