CLSN-547 working - bucket...