Initial CPR support
Removed VIET portrait fix