Update setup

Change code flow to be pragmatic and be sure that all commands are executed.