Modified for Build Script