revegged c99 round 2