removed some _