Adding version 3 branch