Updated finalbuilder