Rebuilt from Daniel's