removed some break points