added loop, removed controls