diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index c29aa96..2206963 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -1,53 +1,22 @@
-import { browser } from '$app/environment';
 import { persisted } from 'svelte-persisted-store';
-import type { EventTemplate, VerifiedEvent } from 'nostr-tools';
-import { get, writable } from 'svelte/store';
-import { getUserMetadata, type User } from '$lib/nostr';
-import { getUserRelays, setRandomRelay } from './relays';
-
-declare global {
-	interface Window {
-		nostr: {
-			getPublicKey: () => Promise<string>;
-			signEvent: (event: EventTemplate) => Promise<VerifiedEvent>;
-		};
-	}
-}
-
-export async function loginWithExtension(retries: number = 10) {
-	if (browser && window.hasOwnProperty('nostr')) {
-		let pubkey = await window.nostr.getPublicKey();
-		if (!pubkey) {
-			throw new Error('Failed to get user pubkey');
-		}
-
-		let user = { pubkey };
-
-		let found = false;
-		for (let i = 0; i < retries; i++) {
-			if (await getUserRelays(user)) {
-				found = true;
-				break;
-			} else {
-				await setRandomRelay();
-			}
-		}
-
-		if (!found) {
-			throw new Error(`Failed to get user relays after ${retries} tries`);
-		}
-
-		loggedInUser.set(await getUserMetadata(user));
-		loggedInWithExtension.set(true);
-
-		console.log("Successfully logged in");
-
-		return get(loggedInUser);
-	} else {
-		throw new Error('No extension found');
-	}
+import { get } from 'svelte/store';
+import { ndk, signer } from '$lib/nostr';
+import { NDKNip07Signer } from '@nostr-dev-kit/ndk';
+
+export function loginWithExtension() {
+	signer.set(new NDKNip07Signer());
+	get(signer)
+		.user()
+		.then((user) => {
+			ndk.update(($ndk) => {
+				$ndk.signer = get(signer);
+				$ndk.activeUser = user;
+				$ndk.activeUser.ndk = $ndk;
+				$ndk.activeUser.fetchProfile().then(() => ndk.set(get(ndk)));
+				$ndk.connect();
+				return $ndk;
+			});
+		});
 }
 
 export const loggedInWithExtension = persisted('loggedInWithExtension', false);
-
-export const loggedInUser = writable<User | null>(null);
diff --git a/src/lib/components/PostHeader.svelte b/src/lib/components/PostHeader.svelte
index dc62543..86144f8 100644
--- a/src/lib/components/PostHeader.svelte
+++ b/src/lib/components/PostHeader.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { base } from '$app/paths';
 	import Avatar from '$lib/components/Avatar.svelte';
-	import { getUserMetadata, npubEncodeShort, type Community, type Post } from '$lib/nostr';
+	import { npubEncodeShort, type Community, type Post, ndk } from '$lib/nostr';
 	import DOMPurify from 'dompurify';
 	import { ArrowsRepeatOutline, BadgeCheckSolid } from 'flowbite-svelte-icons';
 	import { onMount } from 'svelte';
@@ -15,8 +15,8 @@
 
 	$: {
 		for (const community of communities) {
-			community.name = DOMPurify.sanitize(community.name, {ALLOWED_TAGS: []});
-			community.id = DOMPurify.sanitize(community.id, {ALLOWED_TAGS: []});
+			community.name = DOMPurify.sanitize(community.name, { ALLOWED_TAGS: [] });
+			community.id = DOMPurify.sanitize(community.id, { ALLOWED_TAGS: [] });
 
 			communityLinks.push(
 				`<a href="${base}/c/${community.id}" class="hover:underline"> <p>${community.name}</p> </a>`
@@ -28,12 +28,7 @@
 		joinedLinks = communityLinks.join('<span class="text-gray-400"> • </span>');
 	}
 
-	// Get the user metadata
-	onMount(async () => {
-		if (!post.author.meta) {
-			post.author = await getUserMetadata(post.author);
-		}
-	});
+	$: post.author.fetchProfile();
 
 	// Await the communities
 	onMount(async () => {
@@ -65,7 +60,7 @@
 		</div>
 	{:else}
 		<a href="{base}/p/{post.author.pubkey}">
-			<Avatar src={post.author.picture} fallback={post.author.name} size={'xs'} />
+			<Avatar src={post.author.profile?.image} fallback={post.author.profile?.name} size={'xs'} />
 		</a>
 	{/if}
 	<div class="flex flex-col text-xs justify-center items-start">
@@ -78,45 +73,47 @@
 			href="{base}/p/{post.author.pubkey}"
 			class="inline-flex space-x-1 items-center hover:underline"
 		>
-			{#if post.author.name}
-				<p>{post.author.name}</p>
+			{#if post.author.profile?.name}
+				<p>{post.author.profile.name}</p>
 			{:else}
 				<p>{npubEncodeShort(post.author.pubkey)}</p>
 			{/if}
-			{#if post.author.verified}
+			<!-- {#if post.author.verified}
 				<BadgeCheckSolid size="xs" />
 				<div>
 					{post.author.nip05}
 				</div>
-			{/if}
+	{/if} -->
 		</a>
 	</div>
 </div>
 {#if post.repostedBy}
 	{#each post.repostedBy as repostedBy}
 		{#await repostedBy then repostedBy}
-			{#await getUserMetadata(repostedBy.author) then repostAuthor}
-				<div class="flex flex-row overflow-hidden space-x-2 items-center">
-					<ArrowsRepeatOutline size="xs" />
-					<div class="flex flex-col text-xs justify-center items-start">
-						<a
-							href="{base}/p/{repostAuthor.pubkey}"
-							class="inline-flex space-x-1 items-center hover:underline"
-						>
-							{#if repostAuthor.name}
-								<p>{repostAuthor.name}</p>
-							{:else}
-								<p>{npubEncodeShort(repostAuthor.pubkey)}</p>
-							{/if}
-							{#if repostAuthor.verified}
-								<BadgeCheckSolid size="xs" />
-								<div>
-									{repostAuthor.nip05}
-								</div>
-							{/if}
-						</a>
+			{#await repostedBy.author.fetchProfile() then repostAuthor}
+				{#if repostAuthor}
+					<div class="flex flex-row overflow-hidden space-x-2 items-center">
+						<ArrowsRepeatOutline size="xs" />
+						<div class="flex flex-col text-xs justify-center items-start">
+							<a
+								href="{base}/p/{repostAuthor.pubkey}"
+								class="inline-flex space-x-1 items-center hover:underline"
+							>
+								{#if repostAuthor.name}
+									<p>{repostAuthor.name}</p>
+								{:else if repostAuthor.pubkey}
+									<p>{npubEncodeShort(repostAuthor.pubkey)}</p>
+								{/if}
+								{#if repostAuthor.verified}
+									<BadgeCheckSolid size="xs" />
+									<div>
+										{repostAuthor.nip05}
+									</div>
+								{/if}
+							</a>
+						</div>
 					</div>
-				</div>
+				{/if}
 			{/await}
 		{/await}
 	{/each}
diff --git a/src/lib/components/PostInteraction.svelte b/src/lib/components/PostInteraction.svelte
index 8f65084..93d9133 100644
--- a/src/lib/components/PostInteraction.svelte
+++ b/src/lib/components/PostInteraction.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
 	import { base } from '$app/paths';
-	import { loggedInUser } from '$lib/auth';
-	import { getPostReactions, type Post } from '$lib/nostr';
-	import { relayPool, writeRelays } from '$lib/relays';
+	import { getPostReactions, ndk, type Post } from '$lib/nostr';
+	import { NDKEvent } from '@nostr-dev-kit/ndk';
 	import { Button, ButtonGroup } from 'flowbite-svelte';
 	import { ChevronDownOutline, ChevronUpOutline, MessageDotsSolid } from 'flowbite-svelte-icons';
 	import { kinds, type UnsignedEvent } from 'nostr-tools';
@@ -23,9 +22,9 @@
 	});
 
 	async function getUserVote() {
-		if ($loggedInUser) {
-			let event = await relayPool.get($writeRelays, {
-				authors: [$loggedInUser.pubkey],
+		if ($ndk.activeUser) {
+			let event = await $ndk.fetchEvent({
+				authors: [$ndk.activeUser.pubkey],
 				kinds: [kinds.Reaction],
 				'#e': [post.id],
 				'#p': [post.author.pubkey]
@@ -44,27 +43,22 @@
 	}
 
 	async function vote(vote: number) {
-		if (userVote == vote || !$loggedInUser) {
+		if (userVote == vote || !$ndk.activeUser) {
 			return;
 		}
 
-		let reactionEvent: UnsignedEvent = {
+		let reactionEvent = new NDKEvent($ndk, {
 			kind: kinds.Reaction,
-			pubkey: $loggedInUser.pubkey,
+			pubkey: $ndk.activeUser.pubkey,
 			created_at: Math.round(new Date().getTime() / 1000),
 			content: vote == 1 ? '+' : '-',
 			tags: [
 				['e', post.id],
 				['p', post.author.pubkey]
 			]
-		};
+		});
 
-		let signedEvent = await window.nostr.signEvent(reactionEvent);
-		if (signedEvent) {
-			await Promise.any(relayPool.publish($writeRelays, signedEvent));
-		} else {
-			console.error('Failed to sign event');
-		}
+		await reactionEvent.publish();
 
 		userVote = await getUserVote();
 		if (vote == 1) {
diff --git a/src/lib/nostr.ts b/src/lib/nostr.ts
index 67427cf..a790136 100644
--- a/src/lib/nostr.ts
+++ b/src/lib/nostr.ts
@@ -1,14 +1,22 @@
 import { kinds } from 'nostr-tools';
-import { relayPool, readRelays } from '$lib/relays';
-import type { Event } from 'nostr-tools';
-import { get } from 'svelte/store';
-import { isValid } from 'nostr-tools/nip05';
+import { defaultRelays } from '$lib/relays';
+import { derived, get, writable, type Writable } from 'svelte/store';
 import { getRepostedEvent } from 'nostr-tools/nip18';
 import { npubEncode } from 'nostr-tools/nip19';
+import NDKSvelte from '@nostr-dev-kit/ndk-svelte';
+import { NDKEvent, NDKUser, type NDKSigner } from '@nostr-dev-kit/ndk';
+
+export const ndk = writable(
+	new NDKSvelte({
+		explicitRelayUrls: defaultRelays
+	})
+);
+
+export let signer: Writable<NDKSigner> = writable();
 
 export type Community = {
 	id: string;
-	author: User;
+	author: NDKUser;
 	name: string;
 	description: string;
 	image: string;
@@ -20,8 +28,8 @@ export type Community = {
 
 export type Post = {
 	id: string;
-	author: User;
-	createdAt: number;
+	author: NDKUser;
+	createdAt?: number;
 	communities?: (Community | Promise<Community | null>)[];
 	title?: string;
 	content: string;
@@ -29,26 +37,16 @@ export type Post = {
 	repostedBy?: (Post | Promise<Post>)[];
 };
 
-export type User = {
-	pubkey: string;
-	name?: string;
-	nip05?: string;
-	verified?: boolean;
-	about?: string;
-	picture?: string;
-	meta?: Event;
-};
-
 export async function getTopCommunities(since: Date, limit?: number) {
 	let communities: Map<string, number> = new Map();
 
-	let lists = await relayPool.querySync(get(readRelays), {
+	let lists = await get(ndk).fetchEvents({
 		kinds: [kinds.CommunitiesList],
 		since: since.getTime() / 1000,
 		limit: limit
 	});
 
-	lists.forEach((list: Event) => {
+	lists.forEach((list: NDKEvent) => {
 		list.tags.forEach((tag) => {
 			if (tag[0] === 'a' && tag[1].startsWith(kinds.CommunityDefinition.toString())) {
 				communities.set(tag[1], (communities.get(tag[1]) || 0) + 1);
@@ -60,28 +58,28 @@ export async function getTopCommunities(since: Date, limit?: number) {
 }
 
 export async function getNewCommunities(limit: number) {
-	let events = await relayPool.querySync(get(readRelays), {
-		kinds: [kinds.CommunityDefinition],
+	let events = await get(ndk).fetchEvents({
+		kinds: [kinds.CommunityDefinition as number],
 		limit: limit
 	});
-	return events.map(parseCommunityDefinition);
+
+	let res: Community[] = [];
+	events.forEach((e) => res.push(parseCommunityDefinition(e)));
+
+	return res;
 }
 
-export async function getCommunity(author: User, name: string): Promise<Community | null> {
-	let events = await relayPool.querySync(get(readRelays), {
-		kinds: [kinds.CommunityDefinition],
+export async function getCommunity(author: NDKUser, name: string): Promise<Community | null> {
+	let event = await get(ndk).fetchEvent({
+		kinds: [kinds.CommunityDefinition as number],
 		authors: [author.pubkey],
 		'#d': [name]
 	});
 
-	if (events.length === 0) {
-		return null;
-	}
-
-	return parseCommunityDefinition(events[0]);
+	return event === null ? event : parseCommunityDefinition(event);
 }
 
-export function parseCommunityDefinition(event: Event): Community {
+export function parseCommunityDefinition(event: NDKEvent): Community {
 	if (event.kind !== kinds.CommunityDefinition) {
 		throw new Error('Invalid event kind');
 	}
@@ -117,7 +115,7 @@ export function parseCommunityDefinition(event: Event): Community {
 
 	const community: Community = {
 		id,
-		author: { pubkey: author },
+		author: new NDKUser({ pubkey: event.pubkey }),
 		name: name,
 		description,
 		image,
@@ -134,8 +132,8 @@ export function getCommunitySubscribers(
 	callback: (numSubscribers: number) => void
 ) {
 	try {
-		relayPool
-			.querySync(get(readRelays), {
+		get(ndk)
+			.fetchEvents({
 				kinds: [kinds.CommunitiesList],
 				'#a': [`${kinds.CommunityDefinition}:${community.author}:${community.name}`]
 			})
@@ -145,46 +143,9 @@ export function getCommunitySubscribers(
 	}
 }
 
-export async function getUserMetadata(user: User) {
-	let event = await relayPool.get(get(readRelays), {
-		kinds: [kinds.Metadata],
-		authors: [user.pubkey]
-	});
-
-	if (!event) {
-		return user;
-	}
-
-	user.meta = event;
-
-	return parseUserMetadata(event);
-}
-
-export async function parseUserMetadata(event: Event) {
-	if (event.kind !== kinds.Metadata) {
-		throw new Error('Invalid event kind');
-	}
-
-	let user: User = {
-		pubkey: event.pubkey
-	};
-
-	let content = JSON.parse(event.content);
-	user.name = content.name;
-	user.nip05 = content.nip05;
-	user.about = content.about;
-	user.picture = content.picture;
-
-	if (user.nip05) {
-		user.verified = await isValid(event.pubkey, user.nip05);
-	}
-
-	return user;
-}
-
 // TODO: Remove multiple reactions from the same user
 export async function getPostReactions(post: Post) {
-	let events = await relayPool.querySync(get(readRelays), {
+	let events = await get(ndk).fetchEvents({
 		kinds: [kinds.Reaction],
 		'#e': [post.id],
 		'#p': [post.author.pubkey]
@@ -199,30 +160,36 @@ export async function getPostReactions(post: Post) {
 	return reactions;
 }
 
-export function getCommunityTopLevelPosts(community: Community, callback: (posts: Post) => void) {
-	relayPool.subscribeManyEose(
-		get(readRelays),
-		[
-			{
-				kinds: [kinds.ShortTextNote, kinds.LongFormArticle, kinds.Repost],
-				'#a': [`${kinds.CommunityDefinition}:${community.author.pubkey}:${community.name}`]
-			}
-		],
+export function getCommunityTopLevelPosts(community: Community) {
+	let eventStore = get(ndk).storeSubscribe(
 		{
-			onevent(event) {
-				if (!event) {
-					return;
-				} else if (event.kind !== kinds.Repost && event.tags.some((tag) => tag[0] === 'e')) {
-					return;
-				}
-
-				let post = parsePost(event);
-				if (post) {
-					callback(post);
-				}
-			}
+			kinds: [kinds.ShortTextNote, kinds.LongFormArticle, kinds.Repost],
+			'#a': [`${kinds.CommunityDefinition}:${community.author.pubkey}:${community.name}`],
+		},
+		{
+			closeOnEose: true
 		}
 	);
+
+	let postStore = derived(eventStore, ($eventStore) => {
+		return $eventStore.flatMap((event) => {
+			if (!event) {
+				return [];
+			} else if (event.kind !== kinds.Repost && event.tags.some((tag) => tag[0] === 'e')) {
+				return [];
+			}
+
+			let post = parsePost(event);
+
+			if (!post) {
+				return [];
+			} else {
+				return post;
+			}
+		});
+	});
+
+	return postStore;
 }
 
 export function npubEncodeShort(pubkey: string) {
@@ -230,21 +197,22 @@ export function npubEncodeShort(pubkey: string) {
 	return npub.slice(0, 8) + '...' + npub.slice(-8);
 }
 
-export function getEventCommunities(event: Event) {
+export function getEventCommunities(event: NDKEvent) {
 	let communities: Promise<Community | null>[] = [];
 	for (const tag of event.tags) {
 		if (tag[0] === 'a' && tag[1].split(':')[0] === kinds.CommunityDefinition.toString()) {
-			communities.push(getCommunity({ pubkey: tag[1].split(':')[1] }, tag[1].split(':')[2]));
+			let author = new NDKUser({ pubkey: tag[1].split(':')[1] });
+			communities.push(getCommunity(author, tag[1].split(':')[2]));
 		}
 	}
 
 	return communities;
 }
 
-export function parsePost(event: Event) {
+export function parsePost(event: NDKEvent) {
 	let post: Post = {
 		id: event.id,
-		author: { pubkey: event.pubkey },
+		author: event.author,
 		content: event.content,
 		createdAt: event.created_at
 	};
@@ -259,15 +227,10 @@ export function parsePost(event: Event) {
 
 		let repostedPost: Post = {
 			id: repostedEvent.id,
-			author: { pubkey: repostedEvent.pubkey },
+			author: new NDKUser({ pubkey: repostedEvent.pubkey }),
 			content: repostedEvent.content,
 			createdAt: repostedEvent.created_at,
-			communities: [
-				...getEventCommunities(repostedEvent),
-				...getEventCommunities(repostedEvent),
-				...post.communities,
-				...post.communities
-			]
+			communities: [...getEventCommunities(new NDKEvent(get(ndk), repostedEvent)), ...post.communities]
 		};
 
 		repostedPost.repostedBy = [post];
diff --git a/src/lib/relays.ts b/src/lib/relays.ts
index abdf3bd..e986a2b 100644
--- a/src/lib/relays.ts
+++ b/src/lib/relays.ts
@@ -1,7 +1,5 @@
-import { SimplePool, kinds } from 'nostr-tools';
-import { get, writable } from 'svelte/store';
+import {  writable } from 'svelte/store';
 import _ from 'lodash';
-import type { User } from './nostr';
 
 export const defaultRelays = ['wss://nos.lol'];
 
@@ -25,42 +23,3 @@ export async function setRandomRelay() {
 		console.error('Failed to fetch online relays', e);
 	}
 }
-
-export async function getUserRelays(user: User) {
-	let relayListEvent = await relayPool.get(get(readRelays), {
-		authors: [user.pubkey],
-		kinds: [kinds.RelayList]
-	});
-
-	if (relayListEvent) {
-		let newReadRelays = [];
-		let newWriteRelays = [];
-
-		for (const tag of relayListEvent.tags.filter((tag) => tag.length > 1 && tag[0] === 'r')) {
-			if (tag.length == 2) {
-				newReadRelays.push(tag[1]);
-				newWriteRelays.push(tag[1]);
-			} else if (tag[2] === 'read') {
-				newReadRelays.push(tag[1]);
-			} else if (tag[2] === 'write') {
-				newWriteRelays.push(tag[1]);
-			}
-		}
-
-		if (newReadRelays.length > 0) {
-			readRelays.set(newReadRelays);
-		}
-
-		if (newWriteRelays.length > 0) {
-			writeRelays.set(newWriteRelays);
-		}
-
-		console.log('Relays updated', newReadRelays, newWriteRelays);
-		return true;
-	} else {
-		console.error('Failed to get user relay list');
-		return false;
-	}
-}
-
-export const relayPool = new SimplePool();
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 46ae968..7bdcd5e 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -3,7 +3,7 @@
 	import '../app.css';
 	import { base } from '$app/paths';
 	import Avatar from '$lib/components/Avatar.svelte';
-	import { loggedInUser } from '$lib/auth';
+	import { ndk } from '$lib/nostr';
 </script>
 
 <header class="sticky top-0 z-20">
@@ -25,7 +25,7 @@
 				<DarkMode btnClass="" />
 			</NavLi>
 			<NavLi>
-				<Avatar size="sm" src={$loggedInUser?.picture} />
+				<Avatar size="sm" src={$ndk.activeUser?.profile?.image} />
 			</NavLi>
 		</NavUl>
 	</Navbar>
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 00035b5..12338ff 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -1,10 +1,14 @@
 import { loggedInWithExtension, loginWithExtension } from '$lib/auth';
-import { getUserRelays, setRandomRelay } from '$lib/relays';
+import {  setRandomRelay } from '$lib/relays';
 import { get } from 'svelte/store';
 import type { LayoutLoad } from './$types';
+import { ndk } from '$lib/nostr';
 
 export const ssr = false;
 
 export const load: LayoutLoad = async ({ fetch }) => {
+	localStorage.debug = 'ndk:*';
+
+	await get(ndk).connect();
 	loginWithExtension();
 };
diff --git a/src/routes/c/[community]/+page.svelte b/src/routes/c/[community]/+page.svelte
index 2131ea9..27a58c1 100644
--- a/src/routes/c/[community]/+page.svelte
+++ b/src/routes/c/[community]/+page.svelte
@@ -1,27 +1,37 @@
 <script lang="ts">
-	import { readRelays, relayPool } from '$lib/relays';
 	import { page } from '$app/stores';
-	import { parseCommunityDefinition, getCommunityTopLevelPosts, type Post } from '$lib/nostr';
+	import {
+		parseCommunityDefinition,
+		getCommunityTopLevelPosts,
+		type Post,
+		ndk,
+		type Community
+	} from '$lib/nostr';
 	import PostCard from '$lib/components/PostCard.svelte';
-	import { get } from 'svelte/store';
 	import { Heading, Spinner } from 'flowbite-svelte';
 	import Avatar from '$lib/components/Avatar.svelte';
+	import { readable, type Readable } from 'svelte/store';
 
-	let communityPromise = relayPool
-		.get($readRelays, { ids: [$page.params.community] })
-		.then((event) => (event ? parseCommunityDefinition(event) : Promise.reject('Event not found')));
+	let communityStore = $ndk.storeSubscribe({ ids: [$page.params.community] }, { closeOnEose: true });
 
-	let posts: Post[] = [];
-	let postsPromise = communityPromise.then((community) => {
-		getCommunityTopLevelPosts(community, (post: Post) => {
-			posts = [...posts, post];
-		});
-	});
+	let community: Community;
+	$: {
+		if ($communityStore.length !== 0) {
+			community = parseCommunityDefinition($communityStore[0]);
+		}
+	}
+
+	let topLevelPosts: Readable<Post[]> = readable([]);
+	$: {
+		if (community !== undefined) {
+			topLevelPosts = getCommunityTopLevelPosts(community);
+		}
+	}
 </script>
 
-{#await communityPromise}
+{#if community === undefined}
 	<Spinner class="w-full mt-5" />
-{:then community}
+{:else}
 	<div class="p-5 w-full rounded-md h-30 flex flex-row space-x-3 items-center dark:text-white">
 		<div>
 			<Avatar src={community.image} />
@@ -32,13 +42,10 @@
 	</div>
 
 	<ul class="flex flex-col space-y-3 items-stretch">
-		{#await postsPromise}
-			<Spinner />
-		{/await}
-		{#each posts as post}
+		{#each $topLevelPosts as post}
 			<li>
 				<PostCard {post} />
 			</li>
 		{/each}
 	</ul>
-{/await}
+{/if}
diff --git a/src/routes/communities/+page.svelte b/src/routes/communities/+page.svelte
index 00479f8..e083302 100644
--- a/src/routes/communities/+page.svelte
+++ b/src/routes/communities/+page.svelte
@@ -2,7 +2,6 @@
 	import CommunityCard from '$lib/components/CommunityCard.svelte';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
 	import { type Community, getTopCommunities, getCommunity, getNewCommunities } from '$lib/nostr';
-	import pLimit from 'p-limit';
 	import { onMount } from 'svelte';
 	import { Heading, Select, Spinner } from 'flowbite-svelte';
 
@@ -27,13 +26,11 @@
 			let date = new Date(0);
 			let topCommunities = await getTopCommunities(date);
 
-			let limit = pLimit(5);
-
 			topCommunities.map((community) => {
 				let author = { pubkey: community[0].split(':')[1] };
 				let name = community[0].split(':')[2];
 
-				communities = [...communities, limit(() => getCommunity(author, name))];
+				communities = [...communities, getCommunity(author, name)];
 			});
 		} else {
 			communities = await getNewCommunities(100);
diff --git a/src/routes/post/[post]/+page.svelte b/src/routes/post/[post]/+page.svelte
index 6e7a91e..7f5a576 100644
--- a/src/routes/post/[post]/+page.svelte
+++ b/src/routes/post/[post]/+page.svelte
@@ -1,15 +1,14 @@
 <script lang="ts">
 	import { page } from '$app/stores';
 	import PostInteraction from '$lib/components/PostInteraction.svelte';
-	import { relayPool, readRelays } from '$lib/relays';
-	import { type Post, parsePost } from '$lib/nostr';
+	import { type Post, parsePost, ndk } from '$lib/nostr';
 	import { Heading, Skeleton } from 'flowbite-svelte';
 	import PostHeader from '$lib/components/PostHeader.svelte';
 
 	async function findEvent(): Promise<Post | undefined> {
 		let eventId = $page.params.post;
 
-		let event = await relayPool.get($readRelays, { ids: [eventId] });
+		let event = await $ndk.fetchEvent({ ids: [eventId] });
 		if (!event) {
 			throw new Error('Event not found');
 		}