More 2D friendliness