Minor design improvement 3