removed annoying loop