add changes for #2