Chris existing system

@jkamenik tidied up for existing systems.  :eyes: ?