looking it up in the cams manual for improved production,it states that 'a vehicle will remain eligible for the nominated class provided the actual capacity does not exceed the class capacity limit by more than 2%'.this means 1600cc + (16 x 2) cc,or 1632 cc.so 1608 looks legal.better order those 79mm pistons to suit a a15 pin height now.