Using avalon2 branch under avalon2