Added min and max to calc target values