newArchitecture done ! Solo mode works again !