Added default values and added do_until loops