modifications for v04