getting close to final version