Hexagon class improvement