fixing things that connell wanted