Rebuild it optmized