close to final commit for full release!!!