EZP21289 - fix CS and add more details