added v3 hack