Updates for #65