finalized from my side