- changes to SystemConfiguration block as per Jon and David