Updated 8.1 to correctly use with_items