Improve shows

Improve shows