I prefer the second idea personally. The carnival thing did seem a bit weird to start off with.