I recall him saying at the Glasgow Show that when he return's he would be bringing the cave's with him....
So hwo knows... he might by then though have something else up his sleeve - lets hope the stage set will be big - you know, something huge that fills most the stage space
