more progress on draft-04 support