Version 3.40 in progress