removed some unnecessary parameter