Finalizing changes for v.1