put back versions, removed if for embedding