Changed more get_items calls