Almost finished, small bug in cyclic update