removed some parameters