Added switch for new Ophan JS