added system-record and system-shot