Finalizing initial version