changed handling of individual items