Added while and repeat