diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh
index 8af8dc092..2ca6df7d4 100644
--- a/02_activities/assignments/assignment.sh
+++ b/02_activities/assignments/assignment.sh
@@ -10,14 +10,15 @@ set -x
 # Then it unzips the raw data provided by the client.
 
 if [ -d newproject ]; then
-  echo "Directory 'newproject' already exists. Please remove it before running this script."
-  exit 1
+  echo "Recreating the newproject directory"
+  rm -rf newproject
 fi
 mkdir newproject
 cd newproject
 
 mkdir analysis output
 touch README.md
+echo "# Project Name: DSI Consulting Inc." > README.md
 touch analysis/main.py
 
 # download client data
@@ -28,21 +29,28 @@ unzip -q rawdata.zip
 # Complete assignment here
 
 # 1. Create a directory named data
-
+mkdir data
 # 2. Move the ./rawdata directory to ./data/raw
-
+mv rawdata data/raw
 # 3. List the contents of the ./data/raw directory
-
+ls data/raw
 # 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs
-
+mkdir -p data/processed/server_logs data/processed/user_logs data/processed/event_logs
 # 5. Copy all server log files (files with "server" in the name AND a .log extension) from ./data/raw to ./data/processed/server_logs
-
+cp data/raw/*server*.log data/processed/server_logs/
 # 6. Repeat the above step for user logs and event logs
-
+cp data/raw/*user*.log data/processed/user_logs/
+cp data/raw/*event*.log data/processed/event_logs/
 # 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs
+#<<<<<<< HEAD
+rm -v data/raw/*ipaddr*
+rm -v data/processed/user_logs/*ipaddr*
+#=======
+#rf -rf ./data
 
+#>>>>>>> ea20676d33161a6f4d0fcd3c4f7aa5360f0f4309
 # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed
-
+ls ./data/processed/* > ./data/inventory.txt
 
 ###########################################