Changing to JCSystem