now working on 3.9.6