Rebuild the prototype optmized