merging mod delay change from p600fw