I have the bike apart again, I'm going to change the tail and headlights again. I'm on the hunt for a retro 8 inch single headlight, right now.