+ finish the first part of work around ovscript