Add more gun stuff, remove tabs from swingline