made the show map smaller
fixed merge conflict