merge in bct's sweet code