Rebuild with Alex's changes.