Safe reading, some API changes