Refactored add show script