FInish initial version