removed some neverending loops