code improvements also true for masters