removed some lines that had no effect on result