Some re-building code