close to final version