Removed while loop