Refactor a bit, multiple shows