Add changes from tendril