making version 2 and version 3 work same time