changed: Better item loop