Completing 3.1.2