Jhaubrich changes