First attempt at support for HG2