Second branch from fully updated version