modifications to fit to the cloud