added USE_BIG_BUCKET switch