A little more work on new bucket props