start of decode modifications for v5 spec