Shorten codes
Use latest buildscript