Altered input parameters slightly.