improved item handling