Added for and while loops