Finalized the implementation