Updated finalbuilder project