Removed i<2 condition in mainloop