Updated working version from current migrated version