baseline final, oviseva now much cleaner