Add more origins to factory noises
Fix bug where initial origin was only showing