work on a generic Bucket for the cloud. I think its an improvement.