Final version 2.0

While loop instead of GOTO