getting close to a final version