minor changes for possible bugs