Added signal generator and filtering