REmoved some input parameter which were a little confusing