iridakos/goto 2 commits