added 3.24 and 3.29