Changes up to 4.5