removed the goto