move punchbot handling higher