Updated to new versions of Cedar and ABMultiton