Working on 6.5.10 upgrade