modified signal gen
merged conflicts