minor modifcations