Rejig freshrc using new features