first part of changes due to the TZR code review