Added some gotca comments for 17.7