Update to final version (24-1)