speed up update, 3 lists and 2 cycles removal