A JOINT FREQUENCY REGULATION AND PEAK SHAVING