remove control and replace with loop