Complete 3.5.2