diff --git a/.gitignore b/.gitignore
index 0a4807e..8af3092 100755
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@ libpng-*
 expat-*
 fribidi-*
 lame-*
+ffmpeg-3.*
+freetype-*
+libass-*
 
 # Created by http://www.gitignore.io
 
diff --git a/.gitmodules b/.gitmodules
index 042e3ee..b48cfbd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
-[submodule "ffmpeg"]
-	path = ffmpeg
-	url = git://source.ffmpeg.org/ffmpeg.git
+# [submodule "ffmpeg"]
+# 	path = ffmpeg
+# 	url = git://source.ffmpeg.org/ffmpeg.git
 [submodule "x264"]
 	path = x264
 	url = git://git.videolan.org/x264.git
-[submodule "freetype2"]
-	path = freetype2
-	url = git://git.sv.nongnu.org/freetype/freetype2.git
-[submodule "libass"]
-	path = libass
-	url = https://github.com/libass/libass.git
+# [submodule "freetype2"]
+# 	path = freetype2
+# 	url = git://git.sv.nongnu.org/freetype/freetype2.git
+# [submodule "libass"]
+# 	path = libass
+# 	url = https://github.com/libass/libass.git
 [submodule "fontconfig"]
 	path = fontconfig
 	url = git://anongit.freedesktop.org/fontconfig
diff --git a/android_build.sh b/android_build.sh
index 8fb4832..31811fb 100755
--- a/android_build.sh
+++ b/android_build.sh
@@ -16,14 +16,14 @@ do
   # $1 = architecture
   # $2 = base directory
   # $3 = pass 1 if you want to export default compiler environment variables
+  # ./libpng_build.sh $i $BASEDIR 1 || exit 1
+  # ./freetype_build.sh $i $BASEDIR 1 || exit 1
+  # ./expat_build.sh $i $BASEDIR 1 || exit 1
+  # ./fribidi_build.sh $i $BASEDIR 1 || exit 1
+  # ./fontconfig_build.sh $i $BASEDIR 1 || exit 1
+  # ./libass_build.sh $i $BASEDIR 1 || exit 1
+  # ./lame_build.sh $i $BASEDIR 1 || exit 1
   ./x264_build.sh $i $BASEDIR 0 || exit 1
-  ./libpng_build.sh $i $BASEDIR 1 || exit 1
-  ./freetype_build.sh $i $BASEDIR 1 || exit 1
-  ./expat_build.sh $i $BASEDIR 1 || exit 1
-  ./fribidi_build.sh $i $BASEDIR 1 || exit 1
-  ./fontconfig_build.sh $i $BASEDIR 1 || exit 1
-  ./libass_build.sh $i $BASEDIR 1 || exit 1
-  ./lame_build.sh $i $BASEDIR 1 || exit 1
   ./ffmpeg_build.sh $i $BASEDIR 0 || exit 1
 done
 
diff --git a/expat_build.sh b/expat_build.sh
index 611c945..c74a8a0 100755
--- a/expat_build.sh
+++ b/expat_build.sh
@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd expat-2.1.0
+pushd expat-2.2.0
 
 make clean
 
diff --git a/ffmpeg b/ffmpeg
deleted file mode 160000
index fda00aa..0000000
--- a/ffmpeg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fda00aa7749326f02a6ca0a7d9bd9bcda1054071
diff --git a/ffmpeg-pkg-config b/ffmpeg-pkg-config-for-3.3
old mode 100755
new mode 100644
similarity index 100%
rename from ffmpeg-pkg-config
rename to ffmpeg-pkg-config-for-3.3
diff --git a/ffmpeg_build.sh b/ffmpeg_build.sh
index 2bc85be..746c333 100755
--- a/ffmpeg_build.sh
+++ b/ffmpeg_build.sh
@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd ffmpeg
+pushd ffmpeg-3.3.5
 
 case $1 in
   armeabi-v7a | armeabi-v7a-neon)
@@ -22,13 +22,7 @@ make clean
 --cpu="$CPU" \
 --enable-runtime-cpudetect \
 --sysroot="$NDK_SYSROOT" \
---enable-pic \
 --enable-libx264 \
---enable-libass \
---enable-libfreetype \
---enable-libfribidi \
---enable-libmp3lame \
---enable-fontconfig \
 --enable-pthreads \
 --disable-debug \
 --disable-ffserver \
@@ -41,13 +35,20 @@ make clean
 --disable-doc \
 --disable-shared \
 --enable-static \
---pkg-config="${2}/ffmpeg-pkg-config" \
+--enable-small \
+--disable-network \
+--pkg-config="${2}/ffmpeg-pkg-config-for-3.3" \
 --prefix="${2}/build/${1}" \
 --extra-cflags="-I${TOOLCHAIN_PREFIX}/include $CFLAGS" \
 --extra-ldflags="-L${TOOLCHAIN_PREFIX}/lib $LDFLAGS" \
---extra-libs="-lpng -lexpat -lm" \
+--extra-libs="-lx264" \
 --extra-cxxflags="$CXX_FLAGS" || exit 1
 
 make -j${NUMBER_OF_CORES} && make install || exit 1
 
 popd
+
+
+# TODO: ENABLE ONLY FILTERS THAT WE USE. NOW GIVES ERROR WHEN USING CONVERT
+# --disable-filters \
+# --enable-filter=crop,scale,acopy,format,trim,rotate \
diff --git a/freetype2 b/freetype2
deleted file mode 160000
index 44accb9..0000000
--- a/freetype2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 44accb9e2e5b00696cf50a869b68afa2ce3dd389
diff --git a/freetype_build.sh b/freetype_build.sh
index aef08c7..9588cad 100755
--- a/freetype_build.sh
+++ b/freetype_build.sh
@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd freetype2
+pushd freetype-2.7.1
 
 make clean
 
diff --git a/init_update_libs.sh b/init_update_libs.sh
index 5e82329..c5fd5f9 100755
--- a/init_update_libs.sh
+++ b/init_update_libs.sh
@@ -5,13 +5,19 @@ echo "Updating submodules"
 git submodule update --init
 echo "============================================"
 echo "Updating libpng, expat and fribidi"
-rm -rf libpng-*
-rm -rf expat-*
-rm -rf fribidi-*
-rm -rf lame-*
+# rm -rf libpng-*
+# rm -rf expat-*
+# rm -rf fribidi-*
+# rm -rf lame-*
+# rm -rf freetype-*
+# rm -rf libass-*
+rm -rf ffmpeg-*
 
-wget -O- ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.21.tar.xz | tar xJ
-wget -O- http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz | tar xz
-wget -O- http://fribidi.org/download/fribidi-0.19.7.tar.bz2 | tar xj
-wget -O- http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz | tar xz
+# wget -O- ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.29.tar.xz | tar xJ
+# wget -O- https://downloads.sourceforge.net/project/expat/expat/2.2.0/expat-2.2.0.tar.bz2 | tar xj
+# wget -O- http://fribidi.org/download/fribidi-0.19.7.tar.bz2 | tar xj
+# wget -O- http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz | tar xz
+# wget -O- http://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.bz2 | tar xz
+# wget -O- https://github.com/libass/libass/releases/download/0.13.6/libass-0.13.6.tar.xz | tar xz
+wget -O- https://www.ffmpeg.org/releases/ffmpeg-3.3.5.tar.bz2 | tar xz
 echo "============================================"
diff --git a/libass b/libass
deleted file mode 160000
index 7c30fea..0000000
--- a/libass
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7c30feaa6906c5f392f6a1496462504b09fd8df0
diff --git a/libass_build.sh b/libass_build.sh
index 402eef6..2589d55 100755
--- a/libass_build.sh
+++ b/libass_build.sh
@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd libass
+pushd libass-0.13.6
 
 make clean
 
diff --git a/libpng_build.sh b/libpng_build.sh
index a5d75dd..936031c 100755
--- a/libpng_build.sh
+++ b/libpng_build.sh
@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd libpng-1.6.21
+pushd libpng-1.6.29
 
 make clean
 
diff --git a/settings.sh b/settings.sh
index bdf7b94..373a4f1 100755
--- a/settings.sh
+++ b/settings.sh
@@ -1,15 +1,16 @@
 #!/bin/bash
 
-SUPPORTED_ARCHITECTURES=(armeabi-v7a armeabi-v7a-neon x86)
+# SUPPORTED_ARCHITECTURES=(armeabi-v7a armeabi-v7a-neon x86)
+SUPPORTED_ARCHITECTURES=(armeabi-v7a)
 ANDROID_NDK_ROOT_PATH=${ANDROID_NDK}
 if [[ -z "$ANDROID_NDK_ROOT_PATH" ]]; then
   echo "You need to set ANDROID_NDK environment variable, please check instructions"
   exit
 fi
-ANDROID_API_VERSION=9
+ANDROID_API_VERSION=17
 NDK_TOOLCHAIN_ABI_VERSION=4.8
 
-NUMBER_OF_CORES=$(nproc)
+NUMBER_OF_CORES=$(sysctl -n hw.ncpu)
 HOST_UNAME=$(uname -m)
 TARGET_OS=linux