Added infinite mode and updated design