Added partial 4.9 (need to finish)