diff --git a/pleroma-cli.sh b/pleroma-cli.sh
index a3b355996e8588bc6e86418531c8cb791542bd48..d045b4a69c118b0efd5e8398d767458146857efd 100755
--- a/pleroma-cli.sh
+++ b/pleroma-cli.sh
@@ -90,7 +90,14 @@ 	acc_following_count=$(echo $account_info | jj following_count)
 	while [ $count -gt 0 ]; do
 		followings=$(followings_api_get $acc_id)
 		count=$(echo $followings | jj \#)
-		if [ $count -gt 0 ]; then
+		if [ $count -lt 40 ]; then
+			countindex=$(expr $count - 1) 
+			echo $followings | jj -l \#.fqn | sed 's/"//g' >> backups_$instance/friends.csv
+			offset=$(echo $followings | jj $countindex.id)
+			echo "+$count follows"
+			count=0
+			echo "$acc_following_count followings exported"
+		elif [ $count -gt 0 ]; then
 			countindex=$(expr $count - 1) 
 			echo $followings | jj -l \#.fqn | sed 's/"//g' >> backups_$instance/friends.csv
 			offset=$(echo $followings | jj $countindex.id)
@@ -102,10 +109,60 @@ 		sleep 1
 	done 
 }
 
-mutes_api_import()
+blocks_api_export()
+{
+	count=40
+	mkdir -m 711 -p backups_$instance
+	while [ $count -gt 0 ]; do
+		blocks=$(blocks_api_get)
+		count=$(echo $blocks | jj \#)
+		if [ $count -lt 40 ]; then
+			countindex=$(expr $count - 1) 
+			echo $blocks | jj -l \#.fqn | sed 's/"//g' >> backups_$instance/blocks.csv
+			offset=$(echo $blocks | jj $countindex.id)
+			echo "+$count blocks"
+			count=0
+			echo "Blocks exported"
+		elif [ $count -gt 0 ]; then
+			echo $blocks | jj -l \#.fqn | sed 's/"//g' >> backups_$instance/blocks.csv
+			offset=$(echo $blocks | jj $countindex.id)
+			echo "+$count blocks"
+		else
+			echo "Blocks exported"
+		fi
+		sleep 1
+	done 
+}
+
+mutes_api_export()
+{
+	count=40
+	mkdir -m 711 -p backups_$instance
+	while [ $count -gt 0 ]; do
+		mutes=$(mutes_api_get)
+		count=$(echo $mutes | jj \#)
+		if [ $count -lt 40 ]; then
+			countindex=$(expr $count - 1) 
+			echo $mutes | jj -l \#.fqn | sed 's/"//g' >> backups_$instance/mutes.csv
+			offset=$(echo $mutes | jj $countindex.id)
+			echo "+$count mutes"
+			count=0
+			echo "Mutes exported"
+		elif [ $count -gt 0 ]; then
+			echo $mutes | jj -l \#.fqn | sed 's/"//g' >> backups_$instance/mutes.csv
+			offset=$(echo $mutes | jj $countindex.id)
+			echo "+$count mutes"
+		else
+			echo "Mutes exported"
+		fi
+		sleep 1
+	done 
+}
+
+follow_api_import()
 {
-	curl -s --compressed -H "Authorization: Bearer $auth" "$instance_point_pleroma/mutes_import" \
-	--data 'list=@restore/mutes.csv'
+	curl -v --compressed -H "Authorization: Bearer $auth" "$instance_point_pleroma/follow_import" \
+	--data 'list=@restore/friends.csv'
 }
 
 blocks_api_import()
@@ -114,10 +171,10 @@ 	curl -s --compressed -H "Authorization: Bearer $auth" "$instance_point_pleroma/blocks_import" \
 	--data 'list=@restore/blocks.csv'
 }
 
-follow_api_import()
+mutes_api_import()
 {
-	curl -v --compressed -H "Authorization: Bearer $auth" "$instance_point_pleroma/follow_import" \
-	--data 'list=@restore/friends.csv'
+	curl -s --compressed -H "Authorization: Bearer $auth" "$instance_point_pleroma/mutes_import" \
+	--data 'list=@restore/mutes.csv'
 }
 #[MIGRATION SECTION END]
 
@@ -129,6 +186,16 @@
 followings_api_get()
 {
 	default_curl_opt "$instance_point/accounts/$1/following?limit=40&max_id=$offset"
+}
+
+blocks_api_get()
+{
+	default_curl_opt "$instance_point/blocks?limit=40&max_id=$offset"
+}
+
+mutes_api_get()
+{
+	default_curl_opt "$instance_point/mutes?limit=40&max_id=$offset"
 }
 
 thread_api_statuses()