first changes for #230.