Some work on supporting Gen III (limited)