added a bypass for script that do not require this
Migrated updated functions