Finalizing implementation