Improved finalbuilder script