Working on 1.7.10 change