Updated settings again and added while-do loop