Patty's changes