First rebuilding attempt - partial success