More accurate version of current 'live' system