Pinhole optimise working fairly well...