Tp/quality improvements part 4