409.40 tested changes from previous 3 commits