V5 - Setup code & new states