added parameter, removed unnecessary parts