Updated to barf 1.4