more updates to Barrel.cpp