Rebuilt with updates from API