issue 30+31 partwise implemented