Update conditional to use block syntax so it is not attempted to execute
Move restore recipe below general setup