final changes before API freeze