v25 merged, errors commented out