Rework show method