diff --git a/friendica-remove-old-photos-parallel.sh b/friendica-remove-old-photos-parallel.sh
index 05bc27a..e2ca0e9 100755
--- a/friendica-remove-old-photos-parallel.sh
+++ b/friendica-remove-old-photos-parallel.sh
@@ -9,40 +9,49 @@ elif [[ -n $(type mysql) ]]; then
 else
 	exit
 fi
+intense_optimizations=${1:-"0"}
+input_id=${2:-"1"}
 #Set your parameters here
 url=friendica.example.net
 db=friendica
 folder=/var/www/friendica
 folderavatar=/var/www/friendica/avatar
+folderescaped=${folder////\\/}
 loop() {
 	#Parse each file in folder
-	folderescaped=${folder////\\/}
 	ky=$(echo "${y}" | sed -e "s/${folderescaped}/https:\/\/${url}/g" -e "s/-[0-9]*\..*\$//g")
 	f=$("${dbengine}" "${db}" -N -B -q -e "select photo from contact where photo like '${ky}%' limit 1")
 	if [[ $? -eq 0 && -z ${f} && -f ${y} ]]; then
-		rm -rvf "${y}" &
+		if [[ "${intense_optimizations}" -eq 1 ]]; then
+			rm -f "${y}" &
+		else
+			rm -rvf "${y}" &
+		fi
 		if [[ $(jobs -r -p | wc -l) -ge $(($(getconf _NPROCESSORS_ONLN) * 2)) ]]; then
 			wait -n
 		fi
-
-		d=$((d + 1))
+		#d=$((d + 1))
 	fi
 	#printf "\rPhotos: %s\tFolder %s\tEntry %s   " "$d" "$n" "$m"
-	printf "\rFolder %s\tEntry %s  " "${n}" "${m}"
+	if [[ "${intense_optimizations}" -eq 0 ]]; then
+		printf "\rFolder %s\tEntry %s  " "${n}" "${m}"
+	fi
 	return "${d}"
 }
 
 date
 #Go to the Friendica installation
 cd "${folderavatar}" || exit
-#indexlength=$((49 + ${#url}))
-#"${dbengine}" "${db}" -e "alter table contact add index if not exists photo_index (photo(${indexlength}))"
+if [[ "${intense_optimizations}" -eq 1 ]]; then
+	indexlength=$((49 + ${#url}))
+	"${dbengine}" "${db}" -e "alter table contact add index if not exists photo_index (photo(${indexlength}))"
+fi
 n=0
 d=0
 while read -r x; do
 	n=$((n + 1))
 	#If the directory still exists
-	if [[ -d "${x}" ]]; then
+	if [[ -d "${x}" && "${n}" -ge "${input_id}" ]]; then
 		m=0
 		while read -r y; do
 			m=$((m + 1))
@@ -52,6 +61,13 @@ while read -r x; do
 			fi
 		done < <(find "${x}" -type f)
 	fi
+	if [[ "${intense_optimizations}" -eq 1 ]]; then
+		printf "\rFolder %d\tDone     " "${n}"
+	else
+		printf "\r\nFolder %d done - %s\n" "${n}" "${x}"
+	fi
 done < <(find "${folderavatar}" -depth -mindepth 1 -maxdepth 1 -type d)
-#"${dbengine}" "${db}" -e "alter table contact drop index photo_index"
+if [[ "${intense_optimizations}" -eq 1 ]]; then
+	"${dbengine}" "${db}" -e "alter table contact drop index photo_index"
+fi
 date