Add hexagon & and refactor