Uncomment missing lines necessary for rev. 2