Delay is now in place

There is however a minor issue related to the safe zones, where an extra
count is executed, but will take a look at it ASAP!