made changes to cloud impl