Now handles changing of held item