* update for API changes. It compiles, but there might be conflicts,