Commented out Code. oneByOne is broken?