Version 2 of Bucketsuite