some minor modifications.