Finalized initial implementation