more changes for #2