Completely fixed builder