Included former changes