removed 120 line if block