Reverted to last night's version with some API changes