Exp 2.1 Update

New: Remove goto use.