Removed wonky loop