Beauty, thanks. Now I need to sort out the HPFP cam follower and that's all the areas covered ready for a re-map!