Added the new barrel and tweaked some things