Improve the update time by A LOT. It uses at most 2 seconds for 10
items.

Signed-off-by: Staartvin <mijnleraar@msn.com>