Added some ifs and few skips to glide over the problematic areas