cleaned up signal source mode