Finish Initial Version