curve and curve2 fixed