Getting better at bucket management