Removed inner loop