diff --git a/Makefile b/Makefile
index 88f9056..95a1242 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,14 @@
 #    By: whaffman <whaffman@student.codam.nl>    +#+  +:+  +#++#++:++#++       #
 #                                               +#+ +#+#+ +#++#+    +#+ \o/    #
 #    Created: 2024/07/26 21:41:10 by whaffman   #+#+# #+#+# #+#    #+#   |     #
-#    Updated: 2024/07/27 14:54:29 by whaffman   ###   ###  ###    ###   / \    #
+#    Updated: 2024/07/27 17:58:44 by whaffman   ###   ###  ###    ###   / \    #
 #                                                                              #
 # **************************************************************************** #
 
 NAME = minitalk
 
 SOURCES = server.c client.c
-OBJECTS = $(SOURCES:*.c=*.o)
+OBJECTS = $(SOURCES:.c=.o)
 
 CC = cc
 CFLAGS = -Wall -Werror -Wextra
@@ -22,14 +22,15 @@ all: $(NAME)
 
 $(NAME): client server
 
-client: client.o libft/libft.a
-	$(CC) $(CFLAGS) -o client client.o libft/libft.a
+client: client.o libft.a
+	$(CC) $(CFLAGS) -o client client.o libft.a
 
-server: server.o libft/libft.a
-	$(CC) $(CFLAGS) -o server server.o libft/libft.a
+server: server.o libft.a
+	$(CC) $(CFLAGS) -o server server.o libft.a
 
 libft.a:
 	make -C libft
+	mv libft/libft.a libft.a
 
 client.o: client.c
 	$(CC) $(CFLAGS) -c client.c
@@ -42,7 +43,7 @@ clean:
 	make -C libft clean
 
 fclean: clean
-	rm -f client server
+	rm -f client server libft.a
 	make -C libft fclean
 
 re: fclean all
diff --git a/server.c b/server.c
index 6ae4dcf..d1b0ec8 100644
--- a/server.c
+++ b/server.c
@@ -6,25 +6,14 @@
 /*   By: whaffman <whaffman@student.codam.nl>    +#+  +:+  +#++#++:++#++      */
 /*                                              +#+ +#+#+ +#++#+    +#+ \o/   */
 /*   Created: 2024/07/18 17:24:54 by whaffman   #+#+# #+#+# #+#    #+#   |    */
-/*   Updated: 2024/07/27 14:40:08 by whaffman   ###   ###  ###    ###   / \   */
+/*   Updated: 2024/07/27 15:04:43 by whaffman   ###   ###  ###    ###   / \   */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include <signal.h>
 #include <unistd.h>
 #include <stdio.h>
-
-void	ft_putstr(char *str)
-{
-	int	i;
-
-	i = 0;
-	while (str[i])
-	{
-		i++;
-	}
-	write(1, str, i);
-}
+#include "libft.h"
 
 void	signal_handler(int signum, siginfo_t *info, void *context)
 {