Adapted for new system configuration
Changed UP config