modified some return values, and disabled remeshing step