Some changes for #12