more changes for #47